merge trunk
authorKenichi Handa <handa@etlken>
Mon, 28 Jun 2010 03:32:18 +0000 (12:32 +0900)
committerKenichi Handa <handa@etlken>
Mon, 28 Jun 2010 03:32:18 +0000 (12:32 +0900)
commitb342c46b9d5f34861a0f2f8a3db493d506e3f7aa
tree1e2e667b6fb2a4e2b18bd4800c7ef207132c713a
parent7de10642353b64c87c333627ef6628b2240490fd
parent43d0feabe7ed65a50902278088a4dd73421ead1c
merge trunk